f40ea9
@@ -812,6 +812,7 @@
public void shutdown() {
         try {
           ms.shutdown();
         } finally {
+          threadLocalConf.remove();
           threadLocalMS.remove();
         }
       }
